From: Alan Mackenzie <acm@muc.de>
Date: Tue, 12 Sep 2017 16:19:52 +0000 (+0000)
Subject: Don't match C++ template delims starting within a token.  FIxes bug #28418.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~6717^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f4859757b63a056392af410fce6b4938f7f27c00;p=emacs.git

Don't match C++ template delims starting within a token.  FIxes bug #28418.

* lisp/progmodes/cc-engine.el (c-restore-<>-properties): After failing an
attempted match from the start of a token (in particular, "<<"), move to the
next token rather than the nex character before searching for the next "<".
---

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 5ac4a769337..9ea0b2046a6 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6418,7 +6418,7 @@ comment at the start of cc-engine.el for more info."
 			      (not (eq (c-get-char-property (point) 'c-type)
 				       'c-decl-arg-start)))))))
       (or (c-forward-<>-arglist nil)
-	  (forward-char)))))
+	  (c-forward-token-2)))))
 
 
 ;; Functions to handle C++ raw strings.